From 54be07c6b90afd1f148cf574ce7208cd2b5064c9 Mon Sep 17 00:00:00 2001
From: Felix Krull <f_krull@gmx.de>
Date: Fri, 31 May 2019 20:02:02 +0200
Subject: [PATCH] tests: fix checkout_at tests

---
 rust-bindings/rust/tests/repo.rs | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/rust-bindings/rust/tests/repo.rs b/rust-bindings/rust/tests/repo.rs
index 6fddc711..1ae4361b 100644
--- a/rust-bindings/rust/tests/repo.rs
+++ b/rust-bindings/rust/tests/repo.rs
@@ -14,6 +14,7 @@ use gio::NONE_CANCELLABLE;
 use glib::prelude::*;
 use ostree::{
     ObjectName, ObjectType, RepoCheckoutAtOptions, RepoCheckoutMode, RepoCheckoutOverwriteMode,
+    RepoDevInoCache,
 };
 use std::os::unix::io::AsRawFd;
 
@@ -120,6 +121,28 @@ fn should_checkout_at_with_none_options() {
     assert_test_file(checkout_dir.path());
 }
 
+#[test]
+#[cfg(feature = "v2016_8")]
+fn should_checkout_at_with_default_options() {
+    let test_repo = TestRepo::new();
+    let checksum = test_repo.test_commit("test");
+    let checkout_dir = tempfile::tempdir().expect("checkout dir");
+
+    let dirfd = openat::Dir::open(checkout_dir.path()).expect("openat");
+    test_repo
+        .repo
+        .checkout_at(
+            Some(&RepoCheckoutAtOptions::default()),
+            dirfd.as_raw_fd(),
+            "test-checkout",
+            &checksum,
+            NONE_CANCELLABLE,
+        )
+        .expect("checkout at");
+
+    assert_test_file(checkout_dir.path());
+}
+
 #[test]
 #[cfg(feature = "v2016_8")]
 fn should_checkout_at_with_options() {
@@ -133,7 +156,11 @@ fn should_checkout_at_with_options() {
         .checkout_at(
             Some(&RepoCheckoutAtOptions {
                 mode: RepoCheckoutMode::User,
-                overwrite_mode: RepoCheckoutOverwriteMode::UnionIdentical,
+                overwrite_mode: RepoCheckoutOverwriteMode::AddFiles,
+                enable_fsync: true,
+                force_copy: true,
+                force_copy_zerosized: true,
+                devino_to_csum_cache: Some(RepoDevInoCache::new()),
                 ..Default::default()
             }),
             dirfd.as_raw_fd(),
-- 
2.30.2